View Issue Details

IDProjectCategoryView StatusLast Update
0001716K18X001.00 SKB SWANSWpublic2023-05-09 15:41
Reporter(ALTech) Sangmin Choi Assigned To(ALTech) Sangmin Choi Due Date2023-05-09 18:00
PrioritynormalSeveritys4-minorReproducibilityN/A
Status closedResolutionfixed 
Summary0001716: Please apply this patch from BPM-18174.
DescriptionHi, Jason,

Please apply this patch from BPM-18174.

Commit Message
[BPM-18174] revert only sideband part for [PATCH] AMP: CLK: regulate CHECK_ log for different policy

syna-release/ampsdk
CSMAI2-67_roll_back_sideband.patch

Thank you.
TagsNo tags attached.
Attach Tags

Users monitoring this issue

User List There are no users monitoring this issue.

Activities

(ALTech) Sangmin Choi

2023-05-09 15:03

developer  

CSMAI2-67_roll_back_sideband.patch (3,712 bytes)   
diff --git a/amp/src/ddl/comp_clk/source/clk_avsync.c b/amp/src/ddl/comp_clk/source/clk_avsync.c
index dd50552..739a6e2 100755
--- a/amp/src/ddl/comp_clk/source/clk_avsync.c
+++ b/amp/src/ddl/comp_clk/source/clk_avsync.c
@@ -4461,8 +4461,22 @@ HRESULT sideband_check_video_pts(AVSYNC_MGR *pSyncMgr,
         pSyncMgr->m_iSyncAdjCnt = 0;
     }
 _Exit:
-    avsync_mgr_log(pSyncMgr, pStream, hBD, pBDInfo, NULL, eAct, uiTime,
-            uiOrigSTC, uiDelay);
+    AVSU1("[AVS][%d]CHECK_%s([%c][%c] V:0x%08x(%d), M:0x%08x(%d)[%d], "
+          "AM:0x%08x, AM-V:%d)%s, usrdelay %d ms\n",
+          pSyncMgr->m_pAVClock->m_uiClockID,
+          pStream->m_szName,
+          pszSyncChar[pSyncMgr->m_eSyncStatus],
+          pszActChar[eAct], pBDInfo ? (UINT32)pBDInfo->m_uiPtsStart : 0,
+          pBDInfo ? (INT32)(pBDInfo->m_uiPtsStart - pStream->m_uiLastCheckPts): 0,
+          (UINT32)uiOrigSTC, (UINT32)(uiOrigSTC - pStream->m_uiLastCheckStc),
+          uiTime - pStream->m_uiLastCheckTime,
+         (UINT32)uiSTC, pBDInfo ? (UINT32)PTS64_DIFF_WRAP(uiSTC, pBDInfo->m_uiPtsStart) : 0,
+         (pBDInfo && pBDInfo->m_fEosReached) ? "--EOS" : "",
+         pStream->m_iUsrDelay/90);
+
+    pStream->m_uiLastCheckStc = uiOrigSTC;
+    pStream->m_uiLastCheckTime = uiTime;
+    if (pBDInfo) pStream->m_uiLastCheckPts = pBDInfo->m_uiPtsStart;
 
     if ((AMP_CLK_HOLD != eAct) && pBDInfo) {
         pStream->m_uiBuffedTime -= pBDInfo->m_uiDuration;
@@ -4492,7 +4506,7 @@ HRESULT sideband_check_audio_pts(AVSYNC_MGR *pSyncMgr,
                      AMP_CLK_ACT *pAction, AMP_CLK_DROP_INFO *pDropInfo)
 {
     BD_INFO *pBDInfo = 0;
-    AMP_CLK_ACT eAct;
+    AMP_CLK_ACT eActP, eActN, eActL, eAct;
     UINT64 uiSTC = 0;
     UINT32 uiTime = 0, uiRateDen;
     INT32 iRateNum;
@@ -4507,6 +4521,7 @@ HRESULT sideband_check_audio_pts(AVSYNC_MGR *pSyncMgr,
 
     pAudInfo = (AMP_CLK_AREN_INFO *)pRndInfo->m_pPrivData;
     eAct = AMP_CLK_DISP;
+    eActP = eActN = eActL = AMP_CLK_ACT_MAX;
     pBDInfo = stream_resync_to_bd(pStream, hBD);
 
     if (pSyncMgr->m_eSyncStatus == SYNC_DISABLED) {
@@ -4545,8 +4560,30 @@ HRESULT sideband_check_audio_pts(AVSYNC_MGR *pSyncMgr,
     }
 
 _Exit:
-    avsync_mgr_log(pSyncMgr, pStream, hBD, pBDInfo, pAudInfo, eAct, uiTime,
-            uiSTC, pStream->m_iDelay);
+    //eAct = AMP_CLK_DISP;
+    AVSU2("[AVS][%d]CHECK_%s([%c][%c%c%c%c] A:0x%08x(%d), M:0x%08x(%d)[%d], "
+          "O:0x%08x, A:[%d, %d][%d]%s)\n",
+          pSyncMgr->m_pAVClock->m_uiClockID,
+          pStream->m_szName,
+          pszSyncChar[pSyncMgr->m_eSyncStatus],
+          pszActChar[eActP], pszActChar[eActN], pszActChar[eActL],
+          pszActChar[eAct], pBDInfo ? (UINT32)pBDInfo->m_uiPtsStart : 0,
+          pBDInfo ? (UINT32)(GET_PTS_VAL64(pBDInfo->m_uiPtsStart) -
+                    GET_PTS_VAL64(pStream->m_uiLastCheckPts)) : 0,
+          (UINT32)uiSTC, (UINT32)(uiSTC - pStream->m_uiLastCheckStc),
+          uiTime - pStream->m_uiLastCheckTime,
+          pAudInfo ? (UINT32)pAudInfo->m_uiAOutPts : 0,
+          pAudInfo && (pAudInfo->m_uiNumComps > 0) ?
+              pAudInfo->m_eAudCompInfo[0].m_uiInputBD : 0,
+          pAudInfo && (pAudInfo->m_uiNumComps > 0) ?
+              pAudInfo->m_eAudCompInfo[0].m_uiOutputBD : 0,
+          pAudInfo && (pAudInfo->m_uiNumComps > 1) ?
+              pAudInfo->m_eAudCompInfo[1].m_uiInputFullness : 0,
+          (pBDInfo && pBDInfo->m_fEosReached) ? "--EOS" : "");
+
+    pStream->m_uiLastCheckStc = uiSTC;
+    pStream->m_uiLastCheckTime = uiTime;
+    pStream->m_uiLastCheckPts = pBDInfo ? pBDInfo->m_uiPtsStart : 0;
 
     if ((AMP_CLK_HOLD != eAct) && pBDInfo) {
         pStream->m_uiBuffedTime -= pBDInfo->m_uiDuration;

(ALTech) Sangmin Choi

2023-05-09 15:04

developer   ~0013073

Hi, Jason,

Could you please apply this patch until today?
The firmware build is scheduled tomorrow.

Thank you.
Sangmin Choi.

(SW) Jason Ling

2023-05-09 15:33

developer   ~0013074

Hi Sangmin,

Done,
2023-05-09 15:28:29 | jason.tf.ling@fii-.. | 111755f2 | syna-release/ampsdk | [BPM-18174] revert only sideband part for [PATCH] AMP: CLK: re

Thanks,
Jason

(ALTech) Sangmin Choi

2023-05-09 15:41

developer   ~0013076

Hello, Jason,

Thank you always!

Issue History

Date Modified Username Field Change
2023-05-09 15:03 (ALTech) Sangmin Choi New Issue
2023-05-09 15:03 (ALTech) Sangmin Choi Status new => assigned
2023-05-09 15:03 (ALTech) Sangmin Choi Assigned To => (SW) Jason Ling
2023-05-09 15:03 (ALTech) Sangmin Choi File Added: CSMAI2-67_roll_back_sideband.patch
2023-05-09 15:04 (ALTech) Sangmin Choi Note Added: 0013073
2023-05-09 15:33 (SW) Jason Ling Assigned To (SW) Jason Ling => (ALTech) Sangmin Choi
2023-05-09 15:33 (SW) Jason Ling Status assigned => resolved
2023-05-09 15:33 (SW) Jason Ling Resolution open => fixed
2023-05-09 15:33 (SW) Jason Ling Note Added: 0013074
2023-05-09 15:41 (ALTech) Sangmin Choi Status resolved => closed
2023-05-09 15:41 (ALTech) Sangmin Choi Note Added: 0013076